From 52318a414cdf31ce6c12907bfbd6d76364af8a44 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 8 Aug 2005 17:00:21 +0000 Subject: [PATCH] Fix page_to_phys() macro as suggested by Gerd. --- xen/include/asm-x86/io.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 2b733e4e86..8f8abf65c5 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -2,6 +2,7 @@ #define _ASM_IO_H #include +#include #include #define IO_SPACE_LIMIT 0xffff @@ -45,11 +46,7 @@ static inline void * phys_to_virt(unsigned long address) /* * Change "struct pfn_info" to physical address. */ -#ifdef CONFIG_HIGHMEM64G -#define page_to_phys(page) ((u64)(page - frame_table) << PAGE_SHIFT) -#else -#define page_to_phys(page) ((page - frame_table) << PAGE_SHIFT) -#endif +#define page_to_phys(page) ((physaddr_t)(page - frame_table) << PAGE_SHIFT) #define page_to_pfn(_page) ((unsigned long)((_page) - frame_table)) #define page_to_virt(_page) phys_to_virt(page_to_phys(_page)) -- 2.30.2